Add new modes and some fixes refs #5643