warning tweaks; fix missing 100 for diagonal of matrix