fixing some ish