fixed some instantiation issues

ToDo:
Combat
Final instantiation fixes
Animations