fix loads of bugs, add moment as submodule