fixes throughout