Fixed slight problem with Date parse(Thanks Justin) and cleaned up some
code.