fix test
fix typos in comments, add log
renamed files