fix bug and readd missing file