Small changes, and a sandbox for the new version