Fixed stuff and added datetime