fix init-timings
Fixes and enhancements for #23 #22