fill lots of TODO's

find something to be fixed?