fix some bugs
fix many bugs
commit wordspace file
Merge dev branch