started on validate fixes