Made more changes

I forgot what though...