error validation, fixed some defects

everything seems to be working, passing to qa