moment and timer fixes