A couple of fixes and comments. Working.