Todos and comments; rename dataset shim; map() shim not needed by jml()