Made some improvements, fixes and doc's comments.
Removed a few Inline tags.