fixed validation
added history