license bump, some de-crufting