added shipping info and more validation of fields