Several fixes, improvements and enhancements to the interactive graph