Added approate code tags and fixed documentation consistency.

This takes care of no. 6 in issue #6