added missing files/changes (last commit was broken)