further work in displs fixes - still incomplete