solved more of my bugs