Wrapping up comments. Just want to put this in git.