matrix operations cleanup
config changes

building on a winbox is a real pain