fixes and fixes and fixes and more fixes