Fix return message, and add an owner (Does nothing currently)