Various cleanup and accomodations
Merge branch 'master' of https://github.com/Andlon/sonetta