Feature2.0 fix02

Includes requested fixes for License and config file