Fixes to get the original value correctly, also one or two other small things Joel did that I don't know much about
Merge branch 'master' of https://github.com/punkave/lister