Adds more iterations to have more accurate measure
Cleans up project a bit. Fixes some warnings. Refactors a bit.