Lister - a couple of commits I forgot to push

oops - forgot these local commits