I think I have it mostly fixed