final polish and fixes for V0.7