Cleanup, added Logout feature, flock changes to users.json, better redirect