0.01: attempt to import 0.02: Minor code improvements