Interface change, and a few fixes, base_dir for location, locale usage again