Minor tweaks
more