validation fixes and quick add fixes