fix some ish