changed some things, server still broken