Misc changes.
Merge branch 'workshop' of github.com:MrKepzie/Powiter_Core into workshop