Add traces; add simple progress report facility; fix git problems