up #457 #460
 - use matrix extraction
 - various changes in BC