very final fixes