Bugfixing & Scene transitions