Minor changes, improved markup