fix issues: session handling, customisation