Fixed some minor bugs, more stable server