V0.8.0.1 some amends