adding in sessions, not sure whether I want to keep that, bugfixes