commit 3 - minor tweaks