Cleanups, name validation, doc tweaks
Tweaks