Minor updates, mostly to practice after a long lay-off.