changed results (order of attributes)
drop double-nested Q
more special cases for marginal notes; process p in sp more like other p