added validation, nicer success screen