Further tweaks...

Small changes based on developing with Indigo for UG project