- fix some bugs and cleanUp
- some test experiments