Bug fixes + added two transitions