fix some bugzzz