Some style, typo and tracking