Fixing the website and range issues