fixed merge issues, this version displays tweets correctlyish again