better initialization, better timings, fixings