Further Cleanup and Arch Diagram added