More work on feature table
Completed IsOn feature
Minor refactoring of type names
more tests