Picking some low-hanging fruit from the bug tree. When big feature solutions elude me, nice to wrap together several small changes.