made smalls fixes to pass validation