Minor fixes and licensing info