a few more smaller fixes and improvements