Updated for date picker corrections...knucklehead mistakes