Update license and a few cosmetic things