Fixes a wierd issue that caused toVM to return the default when it shouldn't.
Clean up dataModels a bit, both syntax and JSHint warnings.