Brought a few things up to speed...

0 to lambda in no time at all!