Fixed edit and added datetime