Fixed bugs, deployed to server