data.required fix and some other stuff