done a complete pass addressing Florian s comments and adding some newer references