fixes and changes and good stuff like that