adds new entities and some other small changes