Fixed some of output, other small fixes