Formatting + fixes from Olaf, added new Transitions