Ugly but functional fix for graph expansion issue
Slightly ugly fix for some symbol errors
Fix for line shifting columns