final fixes
merged final fixes