added some more validation and look and good feel good