More tweaks and added initial Twitter query logic.