Fixed some things, potentially broke others