added lots of server stuff