Minor tweaks, added rm_ds_store