Feature/0.9.6

what is the significance of these "/not-used/"s? Shouldn't they be Nones?