changes and fixes and stuff