FIXED: cleaned up some logging issues