Adding more layout/graphing details
More bugfixes! Adjusted layout as well.?
Suppressed magic.