add some bugfix