moved the date mode stuff outside of the orignal form and have a working batching
cleaned up a bit
cleaned up some comments