Fix version number confusion
Revamp control file