Add: token buffering;
Update: some modules.