some tweaks....