minor fixes, custom validator