Server work

and some remote tweaks. Totally untested