Small adjustments and license - commit 2