Bug fixes/added license