starting on legacy content cleanup/fixes/tweaks

Signed-off-by: William Rockwood <wrockwood@tadl.org>