Added some more niftyness and correct outputobject