Did not fix bugs, but sorta hid them

yeah...