Add comments & make diagonal blocks optional.