Minor Changes and simplification to produce 1.0.2 Stable.