Fixed-some-things