final fixes without feedback