bugs and fixes and stuff