changes to make logging slightly better