some minor updates, combined make_session into one method