Scale up/down transitions, bugfixes