Fix some bogons due to copy constructors, and improve output