Bug fixes, adding entities and entity placement