Logging improvements and fixing some typos