Fix storage hooks
Merge branch 'master' into activity_benchmark
updated scenario one (work in progress)
bug fix in init_api + added a message for ellapsed time when waiting for api
multiple bug fixes