Changed uml style changes to be similar to Richard's code rondo ur style would make avi cry :/ fixed urs too...