fix bugs, added new entity