Tidy API, fix savepoint bug, magic auto-cluster!