small tweaks and refactor
work on sessions