Added drawing of the transitions + some clean-up