Allow longer name building (commit: 804ef74)
Tweaks (commit: 93c2963)
Fix output dir grrr (commit: b17655d)