tweak some scripts, test more components, use EntityBuilder (it works! yeah!!)