More commenting and small changes.