Update and fix some bugs
Update some bugs