Holy bug fixes, Batman

ha ha ha

maybe i should test stuff before demonstrating

(not finished yet)