minor stuff and fixes [v2.0.1]