Added more cheating safeguards

Also made CURRENT_VERSION version independent and updated version
notation overall