fix a lot
v1.0