Minor colour & speed tweaks