Mostly tweaking. Improved server to allow for same code to run as on the device.