added more validation's and some auto records