Fixed some superficial for building the DOM attributes