Nametag & Orbat fixes

Fixes #495
Addresses #530