Fixed make-element, added serialize