close to last commit

last version of code, diagrams and javadoc