Sundry improvements suggested by cheat sheet