mostly fixed, just testing