Adjusted some logging statements
Updated some fields to better adhear to standards