server fix and other stuff