fix spacing in language file and rename a header
rearrange a language file little
make method order consistent in addition prompts
add remover prefix and listener