Various changes and additions after spotting Phil Sturgeon's library