Final tweaks

Incorporates comments from team.