More Tweaking
Added Catches for no int dates