minor graph changes and code cleanup