fixed some obivoius issues