licence and comment fixes