Fixed UML (typos, calculator method attr's)