Fixed ranged and added better cool down check