fixed stupid problems