Some case fixes.
Added session integration.