Updated commenting; other minor cleanups.