Static Example data + small fixes