Initial tidyups / copyright updates