some fixes(todo)