fixes to add
fix model + moment.js