added moment among other fixes, rx logic needs to be redesigned