Comments and minor break point tweak.