Small changes, working on style issues.