Debugging

Data gathering, changes to output function update, etc