v2.0.2 minor bug fixes