Include GPL licence and tidy up a bit