Bug fixes
Included more log lines