some bugs fixes
new content commit