A few code changes and paper