rename stuff
fix log