Fixes and improvements;