minor tweaks here and there - not that important