minor changes. better error handling on remote