fixed server bugs (part 2), accidentally changed some client stuff