Comments, logging, copyright & improvements following on from code review