dates are fixed. lots of code clean up through 5 files