Bug Fixes discovered in testing.
- Fixed functionality of setup_remote()