Fixed some errors in .next()