Some cleanups and release v0.6