minor changes
tons of fixes and improvements
more fixes