Add copyright and some minor fixes