Fix some bugs and change frame rate