version 0.002 some fixes