Made some silly mistakes, fixed in this commit