small refactor + add subscene
fix