Remaining updates for 3.0.1 - closes #46; closes #48; closes #65