Fix output; fix some other things