minor cleanup. Yes it does appear to work better remotely. Yay