Patient Diagnosis / Symptom Savings, some bug fixes & refactoring