fixed and simplified version management