tweaks to make the bugger run again...