Another big set of Twitter fixes and additions, should be the last for a long while