resolve a number of issues
Release v3.0.1