Minor bug fix
Various minor cleanups
First real implementation of the full output driver