Increased logging functionality.
Small corrections.