Add toroplus and fix stupid path