License update

Bug fixes & license update