fixed bad stuff