bugfix for output swapping, update todo