update moment and some minor fix