Updated more output stuff