List and ListItem added, Bug fixes