Feature/sh package bugfixes

These are the latest improvements that I've made to the sh package format.
@jordansissel