[Zhenghan] small fixes and new feature added
[Zhenghan] small fixes and new feature added