Correct licensing information and squash bugs