More Output formatting and a seg fault fix