Clean up code, add support for configuration files, add additional address search locations