Bugfixes and License