Minor fixes

Got pharmacy working relatively well.