Small changes, mostly experiments