Back to normal

Made a bunch of mess-ups with merging so I had to fix em all. Should be
all good now.