Add licenses and tidy up.