some changes to doctor made during test now copied for commit. If not working, then revert. Some bugs during the demo has been fixed in patient side as well.  Need to do final testing tomorrow to verify.