Major overhaul of paper.

Updated structures and results.

Still need to check some of the results.