More bug fixes and tweaks to get it working remotely.