v2.3 and rank + cmd fixes.