basically just pooping out a lot of fixes, sorry benno