fix & improve scene transitions