add new modes and some fixes refs #5642