Tweaks and Fixes. Also moved from JSONProxy to my own relay