more tweaks to get things running faster