- small fixes and improvements
