Added Year.java, some small changes