Added more Intake Form fields and fixed unit weight retrieval