$cslocation + other code review changes