some tweaks
more tweaks