fixes after a full pass