+ Validation - bugfixes and improvements