fixed some ish