further performance tweaks...