Made a few cometic fixes