removed default locator param

use named parameters instead
fixes for issues 1+2