debugging and fixes

fixes in ECS