code polishing
typo
correction from sebsauvage for longer sessions