Moved ranges up with other configs.  Added intensity range, which will need some tweaking.