Re-license and other comment changes