copypaste server changes from home version
misc changes