fix critical Mode.js bug / change schema
little changes