A number of bug fixes, some extensions. Working on the last couple of steps in the pipeline.