tweaks, comments and improvements.