Added support for dynamic column content, added some docs and tidied up