Bug fixes and support for license text