updated entities and implemented task system