some fixes, prepare to release 2.0.2