Added raw values + bugs fixes