Fixed the remaining

fixed the remaining bugs in the list.