Better logging

Fixes some logging issues and adds some detail