Add -x setting for better logging