better placement for checkedin message
moving a few more logic things around