Bug Fix
Improved Logging