Server Update

Fixed some Client + Server issues.