Additions to #18

made Ordering Dr and Gender not required