Fixes to get the original value correctly, also one or two other small things Joel did that I don't know much about
Fixes to get the original value correctly, also one or two other small things Joel did that I don't know much about

jsumnersmith/lister