0.0.7b

More cleanup...