Tweaked logic for making tweet dictionary to grab user info. Various other tweaks and cleanup