adds in correct copy and fixes a few glitches