better error visibility, reworked session