add some validations
add minor changes to services