Update comments and fix ToString bug.