lots of fixes

lololol this is a bunch