Add implementation details #139
fixed merge problems
changed size on uml file