Range, etc bug fixes