Tighten up whitespace
Add support for missing sampler objects
Use markdown header for portability note