final final fixes