Add some logging
Update defaults