Fix #1; code documented, conforms to new standards.