final fixes!