Fixed elliott mistakes, again