few small changes, license fixes