Change default range and fix some var names