Fixed some stuff... broke more stuff?