some routes weren't working correctly, resourced users as a quick fix for now
merged route changes