graph axis tags and minor cleanup
graph axis tags and minor cleanup