lots of little changes - T. Do