Cleanups, Add valid licensing info