fixed events
added validation methods