tweaks mithro asked for.