Fixed transitions and updated some other things