tweaking for better logging and config options