Fixed the mistakes I made in the others commit...