Started fixing some missing keys and wrong values on keys