remove time tracking, and update a little, including corrections