Lots of changes, especially to date stuff