lots more changes, per @amalloy