Added additional patient demographics. Fixed EF bugs from view changes.