fixes and such
Merge branch 'master' of github.com:ludi1001/IonMedicationSystem