fixes and different ways to list added.