Move to the production server
Fix some bugs