*Location check now uses proper min. & max.
*Minor changes