Fix minor issues, cleanup
Fix out-of-bounds graphs