Littel changed
Fix some bugs