0.9: Moving forward on a couple of unresolved bugs.