Bug Fixes and Comments

Some bugs in the new lookahead algorithm have been fixed and the comment
process has begun as the summer comes towards an end.