Cleaned up log statements
Changed ESI cfg