fixes and improvements
change source