Speed & speed debugging improvements.