fixed some issues and added moment.js