almost done switching to numpy and scipy matrices internally
finished switch to numpy/scipy