some clean up and first streps with logs