Fixed some things, need to work on EOF