Add timer and fix extra BOL whitespace