Fixed some bugs, added some more entities.