tests confirmed & fixed some old comments