checkpoint [ fixes for sign_out events, little cleanups]