List title update #3

Final bug fixes