Fixed some things, broke others