* minor tweaks