Fixes, updates for v1.0.2