Twitter bugfix + cleanups

Replaces #294 (done against proper branch).

@asm89 @XWB ping :panda_face: