Merge in comments from #1