Added flag indicator and logic, fixed long press stuff a bit.