additional fixes and improvements