readd ability to specify userId and userKey. visual tweaks