Some markup enhancements
Some enhancements on the general guide