major dates refactor
date refactor check and some general cleanup