branch clean-up, license update, comments