cleanup and tweaks in the marine-set exo