Fixes some things; still 3 methods broken but should be fixed tonight