bug fixes and some moving around of date and time