Listing issues added, fixing errors and cleaning up