Added surround tips
Added date fixer and repeat fixer