few small improvements to finalize version 0.0.72