- Minor fixes and improvements
