WHOOPS MORE FIXES gonna clean this up