more fixes and changes