add some TODOs
auto-reformat a lot of code