Add floor, Fix entity positioning bug