updated
Changed a few refs
Fixed licensing