fixes per email from Nick 20082013 17:18