License creation and bug fixes