Light edits + datetime fix