Small changes to output and logging system