1. Correct dumping to *.shp file; 2. A lot of bugs fixed