Fix typo in subsection macro
Fix bug in subsection macro
Tweaks.