Update toggle functionality, add m.set util