Copyright update and tweaks