updates and fixes for 1.0.2 release