adding moment library and few other updates