additional callouts, license fix, comments fixed, small changes