Copyright; some minor fixes