fixed up some remote stuff, hurt others