various session and model changes