Many cosmetic changes and confirmation on flagging