Fixes
Better loggin