refactored users
added for bitly and stuff