Shane's paper out; misc changes included