removed all excess profiling stuff
More testing to get Matrix calc right

for some reason, it's not working quite so well.