Minor changes in source files + licence