- some smaller bug fixes and improvements