Comments and documentation improvements