Comments and minor changes...