Some cleanup + adding passability to graph nodes