added more validation

#35