Minor tweeks
more minor tweeks