Fixed things I didn't like