Improve printing and add temp debugging conditions.