tweaks from vhanta