+ Fixes and improvements;