General small fixes, adding entities to screen.