v0.07 - Mostly code clean-up