More changes suggested by Jim, made by me - const pointers, unsigned ints,