Matrix is now in BaseDE class; Fixed a small detail in "selection"