add lists; fix many problems;