fix date
fix incorrect move