Fixed add-families-wts-to-mat! so increments weight rather than clobbering

Also some cleanup.