Change licanse to Apache 2.0.
+ some fixes