Update some code and copyright