Made data path configurable, tidied up storage code, reduced logging delay