Fixed stuff more