fixes some bugs with eoo, however introduces some bad loop logic which w...

...ill need correcting