Update Copyright, fix header sizes