More output and some minor re-jigging of logic