Final changes to Twit Engine