fixes and fixes