more fixes and updates and cleaning