warning corrections
better logging