diagram improvements