Fix some style issues and add reporting