Fix some problems and add to-do file