various nice fixes for things and glaring bugs I missed