Context diagram included, formatting changes