BB Cleanup, added footnote support