fixed some bugs.
preview 11.0