fixed bugs and updated list patterns