Hopefully final regression commit
General interface and output improvements