p18 ding 4

Most of these have been here a while but I had no real inclination to fix them yet.