196 several small changes.. look at code to see changes