Added header, removed errors