Bug fixes and pin updates
Merge branch 'Stable' of https://github.com/bobalong/Bobalong into Stable