Fixed bad stuff