daveg: lots o tweaks.