typographical fixes
Get base name as a generator, closes #73, closes #74