Some header level cleanup and making the code tags work