final fixes perhaps