final fixes?