various final fixes