added editing data, made all data optional for Study