Fixed a couple bugs
Added moment as a dep
Bug fixes