Updated content from BS 2.3 branch and started correcting formatting.