updates mostly to the output parsing