MWTP: fix some license notices + minor optimisations