COmments.
Various minor improvements and refactoring.