fixes and License