More related work and layout fixes.