Comments and incremental improvements.