+ fix injection count defaults to be based on last injection count for given drug, rather than counting number of injections carried out for the drug
PSR2 compliance changes
PSR2 compliance changes