release 0.6 + cleanups in headers