Fixed some issues with output, now only a few bugs remain