fix some stupid problems