fixes fixes and more fixes