- fixes and improvements for ChgMatrix Phase II