tested data constructor, made a couple of fixes