fixes and changes and stuff and junk