last of the 80 char fixes