Updated License &minor fixes