hopefully final fixes