fixes, date stuff, and TODO