argh, more tweaks