Fixed the rest of the minor major problems