twitter adjustments
twitter improvements
Added time constaints
merged