several typo fixes and logging improvements