file bug fixed; todos;