final fixes
fixes