Update version to 2.0.1, and some final tweaks