Random fixes. Working, but need to standardize output.