moccur is back.
Small fixes