Fixes to issues from speeding it up

Various fixes! And a couple more speedups. I also made it so it would work on multiple desktops, I think, although you should check this to be sure!