Various small things + updated license