fix some bad stuff