A few minor changes and experimentation