final fixes? probably not