- fixed: some bugs