Fixed bugs that were made by fixing bugs that were from cool things