merge fixes, other tweaks
removed some DS stores