Add new tracking words. Fix indentation.