All handlers are added and tested - it works yet.
Minor corrections.