Added system diagram
Minor fixes