update moment and some minor fix
Merge branch 'develop'