twitter fix and some cleanup