Brett - fixes... lots of fixes.