hopefully the final fixes