More MODE and FLAGS additions