Comments and licensing fixes