add to-do annotation
add some to-do items
adjust version insertion in makefile