Version 3.0.1

More tweaks, some cleanup