Making overview more complete and concise