Added diagrams to paper.
Removed commented code, unnecessary imports, fix tabbing.