Added configuration, added/corrected locate.