Added some missing override annotations
Some cleaning
Added UML to project