corrections as requested by bytemaster (part 1)