EOF file and performance fixes
bugfix release