Fixed stuff

Did some little fixes