Fixed bugs. Added desc update since datastore viewer can't update that.