Changes for 3b1 suggested by Andy Fyfe <andy@scp.caltech.edu>