Solved a few issues with quick yanking

Oh and then I broke something.