fixes and more fixes