more cleaning
add normal mode indicatio