problem i was talking about is mostly fixed