fix and add lots of todo
remove log