Updated licensing and such