MORE FIXES

HOPEFULLY I'M DONE.