updated vanilla M3N, various tweaks