continue... and fix some bugs
ok