fixed a few issues in the statemachine
refactor only notify when broken
add members with phone numbers
merging stuffs