Lilius's proposals had two components. Who proposed lengthening the year