final fixes2