Better support for listings
Fix various errors