Msc. changes

This is what I've done to tune your code... runs faster and uses a better profiling tool.