Cleaning up xml and better parsing of times.