Merge

Combined changes; cleaned up output formatting