Setting year, various improvements in code.