Merging and resolving conflicts.
Consolidated parameter info, added links to page

And other minor things.