wip - some lifetime fixes