Minor updates and code clean-up, now mostly functional under SBCL 1.1.14 Linux/x86_64