Fixed some bad stuff