-Fixed bug where eof was reported incorrectly
-Fixed bug with header issues