@@ -301,15 +301,15 @@ public int getMoladChalakim() {
     private int gregorianAbsDate;
 
     /**
-     * Returns the number of days in a given month in a given month and year.
+     * Returns the number of days in a given month in a given year and month.
      *
-     * @param month
-     *            the month. As with other cases in this class, this is 1-based, not zero-based.
      * @param year
      *            the year (only impacts February)
+     * @param month
+     *            the month. As with other cases in this class, this is 1-based, not zero-based.
      * @return the number of days in the month in the given year
      */
-    private static int getLastDayOfGregorianMonth(int month, int year) {
+    private static int getLastDayOfGregorianMonth(int year, int month) {
         return YearMonth.of(year, month).lengthOfMonth();
     }
 
@@ -325,7 +325,7 @@ private static LocalDate absDateToDate(int absDate) {
         }
 
         int month = 1; // Search forward month by month from January
-        while (absDate > gregorianDateToAbsDate(year, month, getLastDayOfGregorianMonth(month, year))) {
+        while (absDate > gregorianDateToAbsDate(year, month, getLastDayOfGregorianMonth(year, month))) {
             month++;
         }
 
@@ -357,13 +357,15 @@ public int getAbsDate() {
     private static int gregorianDateToAbsDate(int year, int month, int dayOfMonth) {
         int absDate = dayOfMonth;
         for (int m = month - 1; m > 0; m--) {
-            absDate += getLastDayOfGregorianMonth(m, year); // days in prior months of the year
+            absDate += getLastDayOfGregorianMonth(year, m); // days in prior months of the year
         }
-        return (absDate // days this year
-                + 365 * (year - 1) // days in previous years ignoring leap days
-                + (year - 1) / 4 // Julian leap days before this year
-                - (year - 1) / 100 // minus prior century years
-                + (year - 1) / 400); // plus prior years divisible by 400
+
+        int y = year - 1;
+		return (absDate // days this year
+				+ 365 * y // days in previous years ignoring leap days
+                + y / 4 // Julian leap days before this year
+                - y / 100 // minus prior century years
+                + y / 400); // plus prior years divisible by 400
     }
 
     /**
@@ -374,7 +376,7 @@ private static int gregorianDateToAbsDate(int year, int month, int dayOfMonth) {
      * @return true if it is a leap year
      * @see #isJewishLeapYear()
      */
-    private static boolean isJewishLeapYear(int year) {
+    public static boolean isJewishLeapYear(int year) {
         return ((7 * year) + 1) % 19 < 7;
     }
 
@@ -473,15 +475,16 @@ private static int addDechiyos(int year, int moladDay, int moladParts) {
      * @return the number of <em>chalakim</em> (parts - 1080 to the hour) from the original hypothetical <em>Molad Tohu</em>
      */
     private static long getChalakimSinceMoladTohu(int year, int month) {
-        // Jewish lunar month = 29 days, 12 hours and 793 chalakim
-        // chalakim since Molad Tohu BeHaRaD - 1 day, 5 hours and 204 chalakim
-        int monthOfYear = getJewishMonthOfYear(year, month);
-        int monthsElapsed = (235 * ((year - 1) / 19)) // Months in complete 19-year lunar (Metonic) cycles so far
-                + (12 * ((year - 1) % 19)) // Regular months in this cycle
-                + ((7 * ((year - 1) % 19) + 1) / 19) // Leap months this cycle
-                + (monthOfYear - 1); // add elapsed months till the start of the molad of the month
-        // return chalakim prior to BeHaRaD + number of chalakim since
-        return CHALAKIM_MOLAD_TOHU + (CHALAKIM_PER_MONTH * monthsElapsed);
+    	 int y = year - 1;
+ 		// Jewish lunar month = 29 days, 12 hours and 793 chalakim
+ 		// chalakim since Molad Tohu BeHaRaD - 1 day, 5 hours and 204 chalakim
+ 		int monthOfYear = getJewishMonthOfYear(year, month);
+ 		int monthsElapsed = (235 * (y / 19)) // Months in complete 19-year lunar (Metonic) cycles so far
+                 + (12 * (y % 19)) // Regular months in this cycle
+                 + ((7 * (y % 19) + 1) / 19) // Leap months this cycle
+                 + (monthOfYear - 1); // add elapsed months till the start of the molad of the month
+         // return chalakim prior to BeHaRaD + number of chalakim since
+         return CHALAKIM_MOLAD_TOHU + (CHALAKIM_PER_MONTH * monthsElapsed);
     }
 
     /**
@@ -672,13 +675,13 @@ public int getCheshvanKislevKviah() {
     /**
      * Returns the number of days of a Jewish month for a given month and year.
      *
-     * @param month
-     *            the Jewish month
      * @param year
      *            the Jewish Year
+     * @param month
+     *            the Jewish month
      * @return the number of days for a given Jewish month
      */
-    private static int getDaysInJewishMonth(int month, int year) {
+    private static int getDaysInJewishMonth(int year, int month) {
         if ((month == IYAR) || (month == TAMMUZ) || (month == ELUL) || ((month == CHESHVAN) && !(isCheshvanLong(year)))
                 || ((month == KISLEV) && isKislevShort(year)) || (month == TEVES)
                 || ((month == ADAR) && !(isJewishLeapYear(year))) || (month == ADAR_II)) {
@@ -694,7 +697,7 @@ private static int getDaysInJewishMonth(int month, int year) {
      * @return the number of days for the Jewish month that the calendar is currently set to.
      */
     public int getDaysInJewishMonth() {
-        return getDaysInJewishMonth(getJewishMonth(), getJewishYear());
+        return getDaysInJewishMonth(getJewishYear(), getJewishMonth());
     }
 
     /**
@@ -813,14 +816,14 @@ private static int getDaysSinceStartOfJewishYear(int year, int month, int dayOfM
         if (month < TISHREI) {
             // this year before and after Nissan.
             for (int m = TISHREI; m <= getLastMonthOfJewishYear(year); m++) {
-                elapsedDays += getDaysInJewishMonth(m, year);
+                elapsedDays += getDaysInJewishMonth(year, m);
             }
             for (int m = NISSAN; m < month; m++) {
-                elapsedDays += getDaysInJewishMonth(m, year);
+                elapsedDays += getDaysInJewishMonth(year, m);
             }
         } else { // Add days in prior months this year
             for (int m = TISHREI; m < month; m++) {
-                elapsedDays += getDaysInJewishMonth(m, year);
+                elapsedDays += getDaysInJewishMonth(year, m);
             }
         }
         return elapsedDays;
@@ -956,9 +959,9 @@ public synchronized void setJewishDate(int year, int month, int dayOfMonth, int
 
         validateJewishDate(year, month, dayOfMonth, hours, minutes, chalakim);
 
+        jewishYear = year;
         jewishMonth = month;
         jewishDay = dayOfMonth;
-        jewishYear = year;
         moladHours = hours;
         moladMinutes = minutes;
         moladChalakim = chalakim;
@@ -1188,6 +1191,7 @@ public void minusYears(int years, boolean useAdarAlephForLeapYear){
      * @return the Jewish date in the form "day Month, year" e.g. "21 Shevat, 5729"
      * @see HebrewDateFormatter#format(JewishDate)
      */
+    @Override
     public String toString() {
         return new HebrewDateFormatter().format(this);
     }
@@ -1259,6 +1263,7 @@ public int getDayOfWeek() {
      *
      * @see Object#clone()
      */
+    @Override
     public Object clone() {
         JewishDate clone = null;
         try {
@@ -1279,6 +1284,7 @@ public Object clone() {
      * Overrides {@link Object#hashCode()}.
      * @see Object#hashCode()
      */
+    @Override
     public int hashCode() {
         return Integer.hashCode(gregorianAbsDate);
     }