Some minor fixes
A complete new range has been implemented