fix many bugs. v 2.0.1.8