another set of changes and improvements