added tweet check, minor bug fixes