Restructuring and overall WN8 calculation fixes.