final fixes
real final fixes