included comments, a couple bug fixes.