Enhanced prefix header. Added NR_TODO et al.