Add more modes

fixes #1414 #1434 #1426 #448 #520 #494 #1326 #1315