cleanup, change and clean workspace, fixed some bugs, added new feature, prepare to public build