Cleanup

Small cleanups gathered over last few month. No logic changes.
I changed (hopefully all) occasions of copyright years to 2012-2014.