Adding methods with timeout.
Removing old benchmarks (they're not valid anymore) and using some feedback from golint.