Correctly compare version type.
Don't assign the range type each time.
Merge pull request #214 from Lukasa/luk-sprint-branch

Sprint: More misc fixes