lots of minor changes for v1.0.2 release