misc
MANTA-67 wrapped up planned short-frag changes