Fixed the end of file scanner problem. Scanner now pending thorough testing as long as I don't remember anything else I forgot to implement.