Several small adjustments and a completed session model..