svbstrate v0.2

Update structure as well as a few enhancements, a bit of house
cleaning, and some improved functionality.