some section changes, and TODOs