Server Changes

Fixed server bugs