Debugging + minor changes to the productivity