fewer dumb transitions and general header fixes