Added more todos and controls description