Misc updates to diagonal.cpp