Added some comments, fixed year selection