handle scene hierarchy better + re-sorted