some tweaks...