1.0.2 final touches