Fixed those things I thought I had fized