save encounters
patientID provided after save
missing commits from last commit
some formatting