validation and attributes fixes