fixed required fields and other changes